Drop PANGO_VERSION_CHECK checks

We require Pango 1.49 now.

diff --git a/demos/gtk-demo/fontify.c b/demos/gtk-demo/fontify.c
index 2ceeab94168c7ad58bee94881d40d0cb0726730c..de6a9ca6998061dd4584eb19c617270c6b5299ab 100644 (file)
--- a/demos/gtk-demo/fontify.c
+++ b/demos/gtk-demo/fontify.c
@@ -255,14 +255,12 @@ insert_tags_for_attributes (GtkTextBuffer     *buffer,
           INT_ATTR (insert_hyphens);
           break;
 
-#if PANGO_VERSION_CHECK(1,49,0)
         case PANGO_ATTR_LINE_HEIGHT:
           FLOAT_ATTR (line_height);
           break;
 
         case PANGO_ATTR_ABSOLUTE_LINE_HEIGHT:
           break;
-#endif
 
         case PANGO_ATTR_SHAPE:
         case PANGO_ATTR_ABSOLUTE_SIZE:
@@ -272,10 +270,8 @@ insert_tags_for_attributes (GtkTextBuffer     *buffer,
         case PANGO_ATTR_BACKGROUND_ALPHA:
           break;
 
-#if PANGO_VERSION_CHECK(1,49,0)
         case PANGO_ATTR_TEXT_TRANSFORM:
           break;
-#endif
 
         case PANGO_ATTR_INVALID:
         default:

diff --git a/gtk/gtkcssstyle.c b/gtk/gtkcssstyle.c
index 01e7467a104ddecd1031c26e75026a33433611d5..92a7398988ac8312e0a189cd13d530498e701bd2 100644 (file)
--- a/gtk/gtkcssstyle.c
+++ b/gtk/gtkcssstyle.c
@@ -486,7 +486,6 @@ gtk_css_style_get_pango_attributes (GtkCssStyle *style)
       attrs = add_pango_attr (attrs, pango_attr_letter_spacing_new (letter_spacing * PANGO_SCALE));
     }
 
-#if PANGO_VERSION_CHECK(1, 49, 0)
   /* line-height */
   {
     double height = gtk_css_line_height_value_get (style->font->line_height);
@@ -498,7 +497,6 @@ gtk_css_style_get_pango_attributes (GtkCssStyle *style)
           attrs = add_pango_attr (attrs, pango_attr_line_height_new (height));
       }
    }
-#endif
 
   /* OpenType features */
 

diff --git a/gtk/gtkpango.c b/gtk/gtkpango.c
index beb4a73ef05ee0889573d7e058935d6ae40f1b3c..0fa65a3220338a829b34a7cf7486ec19171b84d8 100644 (file)
--- a/gtk/gtkpango.c
+++ b/gtk/gtkpango.c
@@ -249,7 +249,6 @@ attribute_from_text (GtkBuilder  *builder,
                                                      color->blue * 65535);
         }
       break;
-#if PANGO_VERSION_CHECK(1, 49, 0)
     case PANGO_ATTR_LINE_HEIGHT:
       if (gtk_builder_value_from_string_type (builder, G_TYPE_DOUBLE, value, &val, error))
         attribute = pango_attr_line_height_new (g_value_get_double (&val));
@@ -262,7 +261,6 @@ attribute_from_text (GtkBuilder  *builder,
       if (gtk_builder_value_from_string_type (builder, PANGO_TYPE_TEXT_TRANSFORM, value, &val, error))
         attribute = pango_attr_text_transform_new (g_value_get_enum (&val));
       break;
-#endif
     case PANGO_ATTR_INVALID:
     default:
       break;

diff --git a/gtk/gtktextbuffer.c b/gtk/gtktextbuffer.c
index a611e48a91d3e98071e4eeab9cc67af6eb7eb361..38315286b42b61ede9022d80acf8f41f74765537 100644 (file)
--- a/gtk/gtktextbuffer.c
+++ b/gtk/gtktextbuffer.c
@@ -4689,14 +4689,12 @@ insert_tags_for_attributes (GtkTextBuffer     *buffer,
           INT_ATTR (letter_spacing);
           break;
 
-#if PANGO_VERSION_CHECK(1, 49, 0)
         case PANGO_ATTR_LINE_HEIGHT:
           FLOAT_ATTR (line_height);
           break;
 
         case PANGO_ATTR_ABSOLUTE_LINE_HEIGHT:
           break;
-#endif
 
         case PANGO_ATTR_FONT_FEATURES:
           STRING_ATTR (font_features);
@@ -4714,10 +4712,8 @@ insert_tags_for_attributes (GtkTextBuffer     *buffer,
           INT_ATTR (insert_hyphens);
           break;
 
-#if PANGO_VERSION_CHECK(1, 49, 0)
         case PANGO_ATTR_TEXT_TRANSFORM:
           break;
-#endif
 
         case PANGO_ATTR_SHAPE:
         case PANGO_ATTR_ABSOLUTE_SIZE:

diff --git a/gtk/gtktextlayout.c b/gtk/gtktextlayout.c
index a0cd16697d79a55145f186701c4ab69786b0c4a1..d6ad07ceaf7e4a9f065d6acf8c7cf75a7e7f6351 100644 (file)
--- a/gtk/gtktextlayout.c
+++ b/gtk/gtktextlayout.c
@@ -1638,7 +1638,6 @@ add_text_attrs (GtkTextLayout      *layout,
       pango_attr_list_insert (attrs, attr);
     }
 
-#if PANGO_VERSION_CHECK(1, 49, 0)
   if (style->line_height != 0.0)
     {
       if (style->line_height_is_absolute)
@@ -1650,7 +1649,6 @@ add_text_attrs (GtkTextLayout      *layout,
 
       pango_attr_list_insert (attrs, attr);
     }
-#endif
 
   if (style->font_features)
     {

diff --git a/testsuite/gtk/label.c b/testsuite/gtk/label.c
index e06623e00c8146dd930cbc12d04462968d47bb44..d03a03a6da0341c9cb255baaaf1892f965422d6c 100644 (file)
--- a/testsuite/gtk/label.c
+++ b/testsuite/gtk/label.c
@@ -41,10 +41,8 @@ print_attribute (PangoAttribute *attr, GString *string)
     case PANGO_ATTR_ALLOW_BREAKS:
     case PANGO_ATTR_INSERT_HYPHENS:
     case PANGO_ATTR_SHOW:
-#if PANGO_VERSION_CHECK(1, 49, 0)
     case PANGO_ATTR_ABSOLUTE_LINE_HEIGHT:
     case PANGO_ATTR_TEXT_TRANSFORM:
-#endif
       g_string_append_printf (string, "%d", ((PangoAttrInt *)attr)->value);
       break;
     case PANGO_ATTR_FONT_DESC:
@@ -69,9 +67,7 @@ print_attribute (PangoAttribute *attr, GString *string)
       g_string_append_printf (string, "shape");
       break;
     case PANGO_ATTR_SCALE:
-#if PANGO_VERSION_CHECK(1, 49, 0)
     case PANGO_ATTR_LINE_HEIGHT:
-#endif
       {
         char val[20];